more changes

:D