Improved comb based on Eric's designs