updated for martinfrnka