Use hash instead of 4 dashes for h1
Test for return on valid time element