Added dynamic addign of tip Tailors and updated calc method