update - bug and refactoring to be done at lunch hopefully