new way of picking time, removed unuse classes