Improved responsiveness

Signed-off-by: Oz Ramos <labofoz@gmail.com>