Changed manager logic to use manager field