refactored added fixes