Updated to work with new subscribe API
Syntax adjustments