Brought into a more workable solution