Alex's and Mehmet's code are merged