Revised AF and moving house tasks