some stuff i added