Continued round 1 dev