changed according to roger's changes