Restored general functionality