[ERROR]

Fix huge bug with time and enhance macro