Updated to almost get Pro working