Changes by Jorien properly