Just a few more tweaks to make it more generic