initial modifitions from forked repo