final tweaks to existing set up