edited to fit