Modifications based on Kiki and Zhous suggestion