cleanup
merge conflict
cleanup
add properties for success and warning times