tweaks to get things working for submission