simplified a tiny bit