adjusted to fit new development environment