Faster calls (again)