some modifications i forgot