Changed image and refactored a little