fix development environment and incorporate guard