Updating with Elena's changes