Some basic changes
tdb