added local changes from etans computer