more updates credit Gr8Boi