resolved #1 made code more efficient