Changed methods to get jpg and bmp separately