incorporated elena's changes