(The end 3) Fixing geometry border
Last Commit after presentation