More boomerang stuff
!! WILL CAUSE CONFLICTS MERGE WITH CARE !!