simplified a bit more