Second commit, the one that actually works