removed rollover code