couple of updates to reflect required changes