added some basic stuff