Added argument passing; performance issues have come again