Ready, some changes :/