Changes for pre-milestone1

...