Small changes to method