Updated how I handle content