Several changes. I didn't commit for a long time. Sorry