minor changes in structure nad names