updating to match Karl'sHouse branch