updating the way this should work