developement mile stone 1 - update 2