Made more better and stuff