Added afters and befores