merged with previous changes to master