Updated to use the Zentyal's PEN #