Might want to look at this completion by Holmes