added mac os x functionality for functions that were just added with windows implementation