Updated for new layer methods