new version - removed some deps