added code to unwrap expression