a lot of changes + results