Edited Carousel
trying to merge