Add fixed, need to tests all and run tests