#9 changed some queries