Some minor details changed