be careful on new.html and the hash rocket that Fai deleted
trying to merge with Ros' file
ros changes