Updated to not use portable versions