Updated to Rev6