updated functions
updated after pull from git repo