Added some updates from most recent project.