added some stuff that hope that works