Updated methods
Updated methods