Complete.R refactor