Better version, use in command line