removed wip stuff