added all the junk stuff