Edit constructor to fix initalization