Tweaked interface furthermore