added more defaults