Changed query to be mo better