Added code from conditionals project