some changes to image source class