added some newer better stuff