Updated to reflect addition of Flatstrap