changed aliases
dash instead of underscore
opeiotnal parameters