updated model and finished solver to solve skipped CSs as well