some changes
- it begin working!