Fixed all issues esp. reversing params problem