Tweak to code to interface