Done all fixed