many edits but there is a bug..