some changess....