Added feedback delay + UT #8 #9