changed as suggested