more changes :(