Update 2 with better image names and functions

let's do this