Getting rid of redundant prompt
Fixing bugs