latest changes, almost there