slight adjustment to method