added logistics and some basic changes