Resolved few problems