running changes
renamed and moved functions