Substantially improved code