I put through some of Jussi's changes