basic stuff is now there