Made the prototype more user friendly