1st commit

1st commit and not updated and fixed from today.