Added 25 & 28, cleanup