Updated methods to complete task