Comments deleted
A few changes & options were added