Implement Fouad's changes