Tiny bit more complication for future testing