Modifications for ORB use