Added @shanselman stuff