#506 Additional changes