Final commit with pubnub with little bug