Initial changes implemented