Andreas' changes