Updated design
protype