Improved from code