working on expiry epoch time
finishing epoch handling
epoch expiry should be working now