Big changes to Fiting procedure