removed commented code, changed duration