Few more changes before I switch branches