minor adjustment by damith