refactor
refactor
refactor - gravity ns