Safety blocks

Safety blocks