sync with indyna changes