Commit 2

Replaced with proper code