Improved Working Prototype