Updated to reflect changes made