final,madigan6: Updated daniels code to remove the hardcoded user name