almost done
merged changes