Updated with changes for current version