Improve and fix