Given those changes, I will accept him. The final word needs to come from Roran though - but I think it looks good to me.