fixed last merge conflict, THIS VERSION IS GOOD