Added os check