added some generic stuff