Bug fix & partially reconstruction