removed q dependency