Develop/dynamic

developing and optimizing