Changed NONE defalut value to N