space mixins
trim shared file
update mast to use bp map