More changes to the code. Can't rememeber right now