refactor rr celluloid ext