Updating Initial Prototype