lots of new changeS
merged changes