ok completely fixed