Motor and analog code changes