about to do minimalized changes
added changes