Added fixes for repeated Date retrieval that was slowing down things