Added condition to part output