Commit a first working version of both functions