forget to commit so here is a lot of changes