Alex's changes

More changes here