Updated to use newer remote api