Added some changes, something dosnt work :(