added some stuff from CJSR, PA and Mini Mango that worked well