Implement changes from Tasha & Chae