Revise header according to Oleg's suggestion