added changes and constants