v1.1 updates made according to feedback