Improves performImproves performance and solves timezone issue