Problem007 and 008 added