Modified version for POX