Added thin + refactor