added real basic stuff