a lot of changes
2 new files