adjustments to fix first timer bug