add suggestions from stephen