quick changes
conventions chamges