Fixing V2 and V3
Merge branch 'ProtocolWednesday' of https://github.com/appiphony/Phillips into ProtocolWednesday