commits from workstantion

second changes
1

2