5 and 6 completed and fixed star issue