Added Miami, tweaked PSU/CMU