update vars
new design & integration
mergefix