put setup back in constructor, after fixing core