Considered a suggestion each!

I tested it as far as I could/understood but cannot say if it's really unbreaking!