updates from Gerben implemented