included some code 2X after moving it