some changes
Update with latest changes