* Improve portablity