simplified everything...