updates based on mikes comments