refactored optimised home and thermolaquage