Added some shit for Q values