pre merge
tweaks