moved methods accordingly