Cleanup, added onJoin method