last commit before V2 and design integration