Dirty fix for images, marked changes to make things work