idan's changes