mirroring shaithana's changes.