added some stuff that still doesnt work