Revamped code; added images