Changed header to be able to handle pictures as well