Minor changes
Message box added