Finetech rework

Finetech rework