more changes with bugs