Some methods moved, speed improved