finalizing Carls changes after testing