big changes. I should commit more often