fixed rebasing mistakes / moved constant to top