updated constants througout