started fixing 6.3