added before and after blocks