implement bjornfors comments