Updated with some stuff for fun