Adding some new updated soruce to clean up the comments