working image server
merged changes