some change just for platform dependance