adding duration and some other stuff