via Tristan
changes for code review