added from SOL002_19 -> SOL002_34
SOL002_36 -> 44 & minor changes
removed different datatypes from common file