Updated methods