changed some in-progress code