FIX BUG -check data from master