updated to eliminate/consolidate content