Implement changes instructed by OH3KGR, second try