merged images from eliza's branch