Functions update
merge issue - pyc related??