Updates to many functions
latest from CS