worked on issues mnetioned by Mannon