Updated With Commandline util