Updates to make old code compatible with Petey's UI