Updates from in class hacking