More OTK workarounds.
Added heartbeat and effects.