Changed nosim into carry
Some fixes