Added two tools that help development