Modify for new kepler scenario