Added more changes(Monday)