Comments applied and Mongo added