updated and fixed silliness