updated logic & added images