adding old setup back in