adjusted evententry and orgentry to hold values