Trying to fix helpful functions
Merge branch 'development'