i updated the answers above