v5.4, and added more options for PQSCity