Fixed CGAL issues + new within function