adaptions based on github comments