Replacing previous method
Tidying up method signatures