improved based on the CE1 feedback