added all the stuff i thought i added before