small changes to be tested before implementing SQL