Modified to accommodate more content