Restored functionality