Done points 1. and 2. in #1