Fixed  some bullshit got ready for Samsung and such