Semi fixed some ish with dropping