Making some more changes