sereral changes

changes