Created separate ticket for bullet 3 of #199.
Created separate ticket for bullet 3 of #199.