Added selected toggle + debug