updated to work with Alleyoop v2