merge some lmk stuff from moto