Change for a better readability