tweaked and added some stuff