some changes...
good!