fixing and improving