changed duration handling to hash
fixed conflicts