Introduce algo modification and exception handling