Updated to reflect final functionality