added some awesome ass features