minor modifications working with real system...