Duration added
Solved time bug