Adds a super function, improves refs