- WIP faster function calls (reverted partially temporarily)