Updated: Solution!