Add return statements, with and without return values