Updated to reflect changes in code