added graphics
Fixed merges,added graphics