With Josh's New GUI and new queries