* Improved the pop params code