cleaned up method signatures in praparation for multi-channel support