changing some statick addressing issues