major revisions after testing live