Major fixing being done