Made some slight alterations -NOT FINISHED!-