improve apache part