WIP
L1 updates