Created new classes: Surround and Barrier