changed and fixed