Improved to not use expr