Code updates

View commit comments for more details