Updating to match asp net sample