Actually removed the q dependency this time...