Updated, changed and almost there