reformatted and basically changed everything...