Added more stuff from CAF (jb_chocolate)