added private/public, subscribe/unsubscribe
solved conflitcts