Improved nimrod version