did some reformatting, should be ready to go