add annotation and remove time module