Revert "Kaylas updates"

This reverts commit 346f6c0281218e60737f36b4786cb595d14f53e1.
Revert "Revert "Kaylas updates""

This reverts commit 2bbc163576c3828a69321f7eecd819c5b3f96b58.