Code update for Connor and Eric