merged Alex's changes into site