Changes to reflect Alex's modifications