Fixing the mistakes that were made.................