Restoring some of the old functionality