Added gaurds