Added the jay hammer and more