Further changes to method