Added some changes, and test images