pushed changes made on 12/16