new images and cleaned up logic