updated base and constants