Moved it a little more, sorry for two consecutive commits for the same thing.

Also made some changes to L2.