Updated to be more OSI realistic