Add vidarkr's changes. Produced and In use.