commit part of ahmet's code