Updated for new sprite hierarchy