Added and fixed anton's script