Improved 'zodziai' solution