merge anton's latest commit