Updated method without