some cool changes

edit on new branch