Another piece of my previous edit