Updated main layer
(something broke last time)