added hidden fields to consolidate code