b48ed66 refinments