added some commments, else case