fixed it as per demonstrator