Simplified logic, and force syslib logic