still improving on the time boundary queries