New code to add

Please merge.