Added Non GUI version