version 1.2 - Final new design