Updated some stuff after merge