updates from dev1