some chaniges ;)