more behaviours ported over to new system