Enhance form 600S logic for 2013