Working on time issue