Project Selection reworked