pictures and stuff
after merge