Change Set 1

Added and fixed functions