Major changes to make workable