second commit; deleted more functions