added before and after