Remastered a lot.

Separate l2 and l2 with Define value.