add bounce handling