Plugging the gaps...