Added return val verifcation and removed unnecessary cmd
Added base set
Added set prefix