added bube geometry and basic unit clas