updated to reflect changes after testing