Addition of calfw and make use of it