refactor again (15/08)