Changes suggested by Jussi