Fixing all the mistakes