[@tyki]
I think that's alright considering the clarifications we had here, but let me know if I should change anything