Some changes
Add working version