updated for refinery 2.0