Updated interface
Made logic into on-liners