Updated console application
Updated web app