Removed dynamic params for better performance. Fixed a minor param reading bug.