Fix layers Part 1