done finnal version :)