fixed bugs 7 & 8