Conform to jan's requests