Updated version for better readability