Committing 2nd ones solution.