Changed the Code of FUN-1 and FUN-2 as per request