Changes Milestone1

working copy