Updated formatting and queries.