kinda 1/2 ass fixing the carousel