commented out conflicting functions
Merge branch 'sdev' into develop