Add Guard
next step is 4.0.0