Partial Implementation of First change