working and fixing