Adding back functionality that was removed from main