fix and testing