Changes for removing the "star" code