Revert afd0a7b..a3a67ba

This rolls back to commit afd0a7ba0a717338ee2994e74e08d6cdefe87e29.
playing with functions