Steven Conner's code added