added basic stuff