some changes :/