Changed some method names to clarify function