only a few extra changes