Improved the cases