new changes almost there