changed global var impls
cleanup

cleanup