* Trying to come around some performance issues