conflict fixed - merged from position_fix branch