Done some changes for my working platform