tried to fix construct, not done yet