-Pulled changes, updated methods accordingly