added some necessary stuff