Working changes. Not complete