Quick update that may be optimized later but bugfix needed for adding new CD