Update after fixing styling and combining from neel's computer