Updated for better readability