changes made per martinjc