Added last remaining business logic