updated to work with ß5