some changes, lets hope for errors