Added Sample Condition and upgrade step