Moves completed check into the correct method