C3 nadeem search

@Reem-Sharkawy  please review and merge