i added some more changes