changing to .all method