Added more codes