fixing Danny's issues