Tweaked the interface