New streamlined version