Some methods still requiring fixes.