improve with full quiet support