better with all changes