Updated to use repa 3