Fixed some of L2