now works with preceeding patches