some basics changes