Addded a bunch more changes