Updated to use grdale wrapper