Modified with plots