More code additions. Added notice message