improved handler headers in order to lessen workload