UPDATED: simplified kwarg passing