added support for oneliners;