refactored, removed params