changes done
almost there