Adding some elimination logic