apply changed based on David's review