Commit 2, trying to solve the type error