Added before and after section