Updated to work with current PoE patch