Changes applied - attempt 2