Changed comp version to 3.5, fixed loading issues