modified some of the stuff please dont hate me