Adding all changes made for 12/18/14 meeting