changed a bit again