migrating to non-tar input model
fixing time issue