added more layers and other updates