Suppressed memroy leaks. Added change functions