Updated to be simpler code - which works! refs #7110