adapted to new development environment