improved function-content