Added more manual stuff