Ok. Let me know once you have all changes ready and I will review again! ;)