commit before new branch
exists some errors due to new architecture