made changes to the new branch

unifying all that was done yet!