Improvements
Changes
Fix double