updated to answers