Issam to remove this block before merging