removed fancy stuff