Corner Cases are now being taken into consideration