finally committing last minute changes from prague