changed stuff a bit