Fixed to make it simpler and more KISS