Improve return