fixing and testing