Extended and fixed