* logic drastically improved