commit before big rework to ultrasonics