special update changes
merge with Johnny's code