improves this much more #46