Added @area and @perimeter