Fixed main function because id-s was changed