Change type to reflect Matt's designs