using BETWEEN macro, and fixing fallback position