jaroslawp try1 - initial build for 6 and 7