expand ready
not needed now
Merge branch 'feature/expand_func' into develop