pull request for ex1 and ex2