commit 13b - translating the rest of the code