some changes (again ^^)