probabally refactoring the code and await testing the real milan map