moved times to allocation and fixed factories