Rearranged Goals according to predictable feature set