refactor from pebble to disc