some changes, ;-)