tweaks to make more mountable