Updated scenario and ts mostly working