Completed logic for methods