integrate cyril's review remarks