more modifications
set user's buffer to 500