Should finally be working 100%