Added final features to prototype