updated to reflect changes made by alex