Implemented changes requested by Simon