A Couple more changes : )