my latest commit fixed (the rest)