Add modifications, one bug left