Added #4 and updated #3