re-arrange timestamp requirements