updated and added more