maybe got some query ps working