starting to merge Alexander's suggestions