little more basic shit added in