synced up with OCTOTROG code