Code adjustenments