Changed almost everything