Glenwhan update

Final design 2 for Glenwhan