improved accept behavior