This time I have the complete edit I need

So its ready to commit for sure