commit @nik's code