Updated Castling method