post-maker faire and pre-SLAM changes