Updates internal functions to avoid use of modulus 15
Updates version