some changes =)