added word break and extra conditional