An attempt to simplify things that got confusing