resolved issue 10 and 7