Another update for platform independence