squash several commits from different sources probably caf to have a stable code